From ffff1ba93b864fefd07a584e41637b8d33a83a65 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 20 Jun 2017 19:31:31 +0000 Subject: [PATCH] Enable ICONV and C++11 build --- debian/changelog | 6 ++++-- debian/rules | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 363a644a..37d6033a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ dcmtk (3.6.1~20170228-1) unstable; urgency=medium * Upload to unstable Closes: #747167 - * d/rules: correct enabling private tags, Closes: #859201 - + * d/rules: - correct enabling private tags, Closes: #859201 + - correctly enable ICONV, Closes: #701802 + - enable C++11 build + -- Gert Wollny Tue, 20 Jun 2017 18:58:39 +0000 diff --git a/debian/rules b/debian/rules index dc8b8e02..39595348 100755 --- a/debian/rules +++ b/debian/rules @@ -36,10 +36,14 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_TIFF:BOOL=ON \ -DDCMTK_WITH_ZLIB:BOOL=ON \ -DDCMTK_WITH_ICONV:BOOL=ON \ + -DLIBICONV_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \ + -DLIBCHARSET_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \ + -DLIBCHARSET_INCLUDE_DIR:FILEPATH=/usr/include \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk11 \ - -DCMAKE_SKIP_RPATH:BOOL=OFF + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMTK_USE_CXX11_STL:BOOL=ON override_dh_auto_configure: -- 2.30.2